From 294ca1e0f4e08fed6fb43c8db7dd601a5fd9da6d Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Sun, 13 Dec 2020 12:55:21 +0100 Subject: [PATCH] Revert "Do not build qt on some (GLES) archs" This reverts commit b80e4ab03f75e1e82e32ec4c04785fe6b45b0c34. --- debian/control | 4 ++-- debian/rules | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index d8eb0f81d..3de3d7665 100644 --- a/debian/control +++ b/debian/control @@ -248,7 +248,7 @@ Description: VTK examples This package provides examples for VTK9 Package: libvtk9-qt -Architecture: amd64 arm64 i386 mips64el ppc64el s390x +Architecture: any Section: libs Depends: ${misc:Depends}, ${shlibs:Depends} @@ -260,7 +260,7 @@ Description: VTK libraries, Qt files that use VTK. Qt files Package: libvtk9-qt-dev -Architecture: amd64 arm64 i386 mips64el ppc64el s390x +Architecture: any Section: libdevel Depends: libvtk9-dev (= ${binary:Version}), libvtk9-qt (= ${binary:Version}), diff --git a/debian/rules b/debian/rules index feb9df503..28d8f8e4a 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,7 @@ extra_flags += \ -DVTK_BUILD_EXAMPLES=OFF \ -DVTK_BUILD_TESTING=OFF \ -DVTK_EXTRA_COMPILER_WARNINGS=ON \ + -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" \ -DVTK_MODULE_ENABLE_VTK_RenderingTk:STRING="YES" \ -DVTK_MODULE_ENABLE_VTK_utf8:STRING="YES" \ -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \ @@ -55,14 +56,6 @@ extra_flags += \ -DVTK_WRAP_PYTHON=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo - -noqt_archs="armel armhf" -ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(noqt_archs))) - extra_flags += -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" -DVTK_MODULE_ENABLE_VTK_ViewsQt:STRING="YES" -DVTK_GROUP_ENABLE_Qt:STRING="YES" -else - extra_flags += -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="NO" -DVTK_MODULE_ENABLE_VTK_ViewsQt:STRING="NO" -DVTK_GROUP_ENABLE_Qt:STRING="NO" -endif - override_dh_auto_configure: dh_auto_configure -- $(extra_flags) -- 2.30.2